From 7ca36cd2d42df4a0282963c9f33fcd5152bf1e6b Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 29 Mar 2020 20:09:33 -0400
Subject: [PATCH] Stop setting can-focus in ui files

None of these settings are necessary.
---
 gtk/ui/gtkappchooserdialog.ui    |  2 --
 gtk/ui/gtkappchooserwidget.ui    |  2 --
 gtk/ui/gtkassistant.ui           |  7 -------
 gtk/ui/gtkcoloreditor.ui         |  9 ---------
 gtk/ui/gtkfontchooserwidget.ui   |  8 --------
 gtk/ui/gtklockbutton.ui          |  1 -
 gtk/ui/gtkmediacontrols.ui       |  2 --
 gtk/ui/gtkpagesetupunixdialog.ui |  4 ----
 gtk/ui/gtkplacesview.ui          |  6 ------
 gtk/ui/gtkplacesviewrow.ui       |  1 -
 gtk/ui/gtkprintunixdialog.ui     | 20 --------------------
 gtk/ui/gtkscalebutton.ui         |  4 ----
 gtk/ui/gtkvolumebutton.ui        |  1 -
 13 files changed, 67 deletions(-)

diff --git a/gtk/ui/gtkappchooserdialog.ui b/gtk/ui/gtkappchooserdialog.ui
index 43d075ae15..654bb31d30 100644
--- a/gtk/ui/gtkappchooserdialog.ui
+++ b/gtk/ui/gtkappchooserdialog.ui
@@ -59,14 +59,12 @@
   <object class="GtkButton" id="show_more_button">
     <property name="label" translatable="yes">_View All Applications</property>
     <property name="use-underline">1</property>
-    <property name="can-focus">1</property>
     <property name="receives-default">1</property>
     <signal name="clicked" handler="show_more_button_clicked_cb" swapped="no"/>
   </object>
   <object class="GtkButton" id="software_button">
     <property name="label" translatable="yes">_Find New Applications</property>
     <property name="use-underline">1</property>
-    <property name="can-focus">1</property>
     <property name="receives-default">1</property>
     <signal name="clicked" handler="software_button_clicked_cb" swapped="no"/>
   </object>
diff --git a/gtk/ui/gtkappchooserwidget.ui b/gtk/ui/gtkappchooserwidget.ui
index 60241c2a89..efca0e6b0b 100644
--- a/gtk/ui/gtkappchooserwidget.ui
+++ b/gtk/ui/gtkappchooserwidget.ui
@@ -24,12 +24,10 @@
           <object class="GtkScrolledWindow" id="scrolled_window">
             <property name="width-request">400</property>
             <property name="height-request">300</property>
-            <property name="can-focus">1</property>
             <property name="hscrollbar-policy">never</property>
             <property name="shadow-type">in</property>
             <child>
               <object class="GtkTreeView" id="program_list">
-                <property name="can-focus">1</property>
                 <property name="model">program_list_sort</property>
                 <property name="headers-visible">0</property>
                 <signal name="row-activated" handler="program_list_selection_activated" swapped="no"/>
diff --git a/gtk/ui/gtkassistant.ui b/gtk/ui/gtkassistant.ui
index 44b4260bd2..d380d44257 100644
--- a/gtk/ui/gtkassistant.ui
+++ b/gtk/ui/gtkassistant.ui
@@ -20,7 +20,6 @@
             <property name="hexpand">1</property>
             <child>
               <object class="GtkStack" id="content">
-                <property name="can-focus">1</property>
                 <property name="vexpand">1</property>
                 <signal name="remove" handler="assistant_remove_page_cb" swapped="no"/>
                 <child type="tab"/>
@@ -38,7 +37,6 @@
                   <object class="GtkButton" id="close">
                     <property name="visible">0</property>
                     <property name="label" translatable="yes">_Close</property>
-                    <property name="can-focus">1</property>
                     <property name="receives-default">1</property>
                     <property name="use-underline">1</property>
                     <style>
@@ -51,7 +49,6 @@
                   <object class="GtkButton" id="cancel">
                     <property name="visible">0</property>
                     <property name="label" translatable="yes">_Cancel</property>
-                    <property name="can-focus">1</property>
                     <property name="receives-default">1</property>
                     <property name="use-underline">1</property>
                     <style>
@@ -64,7 +61,6 @@
                   <object class="GtkButton" id="last">
                     <property name="visible">0</property>
                     <property name="label" translatable="yes">_Finish</property>
-                    <property name="can-focus">1</property>
                     <property name="receives-default">1</property>
                     <property name="use-underline">1</property>
                     <style>
@@ -76,7 +72,6 @@
                 <child>
                   <object class="GtkButton" id="back">
                     <property name="label" translatable="yes">_Back</property>
-                    <property name="can-focus">1</property>
                     <property name="receives-default">1</property>
                     <property name="use-underline">1</property>
                     <style>
@@ -88,7 +83,6 @@
                 <child>
                   <object class="GtkButton" id="forward">
                     <property name="label" translatable="yes">_Next</property>
-                    <property name="can-focus">1</property>
                     <property name="receives-default">1</property>
                     <property name="use-underline">1</property>
                     <style>
@@ -101,7 +95,6 @@
                   <object class="GtkButton" id="apply">
                     <property name="visible">0</property>
                     <property name="label" translatable="yes">_Apply</property>
-                    <property name="can-focus">1</property>
                     <property name="receives-default">1</property>
                     <property name="use-underline">1</property>
                     <style>
diff --git a/gtk/ui/gtkcoloreditor.ui b/gtk/ui/gtkcoloreditor.ui
index d03b287278..f961866edb 100644
--- a/gtk/ui/gtkcoloreditor.ui
+++ b/gtk/ui/gtkcoloreditor.ui
@@ -54,7 +54,6 @@
             <child>
               <object class="GtkColorSwatch" id="swatch">
                 <property name="name">editor-color-sample</property>
-                <property name="can-focus">False</property>
                 <property name="rgba">rgb(255,255,255)</property>
                 <property name="selectable">False</property>
                 <property name="has-menu">False</property>
@@ -66,7 +65,6 @@
             </child>
             <child>
               <object class="GtkEntry" id="entry">
-                <property name="can-focus">1</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="entry-atkobject">
                     <property name="AtkObject::accessible-name" translatable="yes">Color Name</property>
@@ -84,7 +82,6 @@
             <child>
               <object class="GtkColorScale" id="h_slider">
                 <property name="name">h</property>
-                <property name="can-focus">True</property>
                 <property name="orientation">vertical</property>
                 <property name="adjustment">h_adj</property>
                 <property name="draw-value">False</property>
@@ -98,7 +95,6 @@
             <child>
               <object class="GtkColorScale" id="a_slider">
                 <property name="name">a</property>
-                <property name="can-focus">True</property>
                 <property name="adjustment">a_adj</property>
                 <property name="draw-value">False</property>
                 <property name="scale-type">1</property>
@@ -118,7 +114,6 @@
                 <property name="name">sv</property>
                 <property name="width-request">300</property>
                 <property name="height-request">300</property>
-                <property name="can-focus">True</property>
                 <property name="h-adjustment">h_adj</property>
                 <property name="s-adjustment">s_adj</property>
                 <property name="v-adjustment">v_adj</property>
@@ -158,7 +153,6 @@
         </child>
         <child>
           <object class="GtkSpinButton" id="a_entry">
-            <property name="can-focus">1</property>
             <property name="width-chars">2</property>
             <property name="max-width-chars">2</property>
             <property name="climb-rate">1</property>
@@ -200,7 +194,6 @@
         </child>
         <child>
           <object class="GtkSpinButton" id="h_entry">
-            <property name="can-focus">1</property>
             <property name="width-chars">2</property>
             <property name="max-width-chars">2</property>
             <property name="climb-rate">1</property>
@@ -252,7 +245,6 @@
         </child>
         <child>
           <object class="GtkSpinButton" id="s_entry">
-            <property name="can-focus">1</property>
             <property name="width-chars">2</property>
             <property name="max-width-chars">2</property>
             <property name="climb-rate">1</property>
@@ -269,7 +261,6 @@
         </child>
         <child>
           <object class="GtkSpinButton" id="v_entry">
-            <property name="can-focus">1</property>
             <property name="width-chars">2</property>
             <property name="max-width-chars">2</property>
             <property name="climb-rate">1</property>
diff --git a/gtk/ui/gtkfontchooserwidget.ui b/gtk/ui/gtkfontchooserwidget.ui
index 4bf228518a..3a94b91d11 100644
--- a/gtk/ui/gtkfontchooserwidget.ui
+++ b/gtk/ui/gtkfontchooserwidget.ui
@@ -61,14 +61,12 @@
                               <object class="GtkScrolledWindow" id="list_scrolled_window">
                                 <property name="width-request">400</property>
                                 <property name="height-request">300</property>
-                                <property name="can-focus">1</property>
                                 <property name="hexpand">1</property>
                                 <property name="vexpand">1</property>
                                 <property name="hscrollbar-policy">never</property>
                                 <property name="shadow-type">etched-in</property>
                                 <child>
                                   <object class="GtkTreeView" id="family_face_list">
-                                    <property name="can-focus">1</property>
                                     <property name="model">filter_model</property>
                                     <property name="headers-visible">0</property>
                                     <property name="enable-search">0</property>
@@ -103,7 +101,6 @@
                             </child>
                             <child>
                               <object class="GtkEntry" id="preview">
-                                <property name="can-focus">1</property>
                                 <property name="placeholder-text" translatable="yes">Preview text</property>
                                 <child>
                                   <object class="GtkEventControllerScroll">
@@ -131,7 +128,6 @@
                             </child>
                             <child>
                               <object class="GtkScale" id="size_slider">
-                                <property name="can-focus">1</property>
                                 <property name="hexpand">1</property>
                                 <property name="adjustment">slider_adjustment</property>
                                 <property name="draw-value">0</property>
@@ -150,7 +146,6 @@
                             </child>
                             <child>
                               <object class="GtkSpinButton" id="size_spin">
-                                <property name="can-focus">1</property>
                                 <property name="adjustment">spin_adjustment</property>
                                 <property name="valign">center</property>
                                 <signal name="output" handler="output_cb"/>
@@ -233,7 +228,6 @@
                 </child>
                 <child>
                   <object class="GtkEntry" id="preview2">
-                    <property name="can-focus">1</property>
                     <property name="placeholder-text" translatable="yes">Preview text</property>
                     <property name="text" bind-source="preview" bind-property="text" bind-flags="bidirectional"/>
                     <property name="attributes" bind-source="preview" bind-property="attributes" bind-flags="bidirectional"/>
@@ -272,7 +266,6 @@
                             </child>
                             <child>
                               <object class="GtkScale" id="size_slider2">
-                                <property name="can-focus">1</property>
                                 <property name="hexpand">1</property>
                                 <property name="adjustment">slider_adjustment</property>
                                 <property name="draw-value">0</property>
@@ -285,7 +278,6 @@
                             </child>
                             <child>
                               <object class="GtkSpinButton" id="size_spin2">
-                                <property name="can-focus">1</property>
                                 <property name="adjustment">spin_adjustment</property>
                                 <property name="valign">center</property>
                                 <signal name="output" handler="output_cb"/>
diff --git a/gtk/ui/gtklockbutton.ui b/gtk/ui/gtklockbutton.ui
index 820ba63692..a5bb4538f6 100644
--- a/gtk/ui/gtklockbutton.ui
+++ b/gtk/ui/gtklockbutton.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkLockButton" parent="GtkButton">
-    <property name="can-focus">1</property>
     <property name="receives-default">1</property>
     <child>
       <object class="GtkBox" id="box">
diff --git a/gtk/ui/gtkmediacontrols.ui b/gtk/ui/gtkmediacontrols.ui
index 011d3f9ca2..bc12721713 100644
--- a/gtk/ui/gtkmediacontrols.ui
+++ b/gtk/ui/gtkmediacontrols.ui
@@ -20,7 +20,6 @@
         <property name="spacing">6</property>
         <child>
           <object class="GtkButton" id="play_button">
-            <property name="can-focus">1</property>
             <property name="receives-default">1</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
@@ -36,7 +35,6 @@
             <child>
               <object class="GtkScale" id="seek_scale">
                 <property name="adjustment">time_adjustment</property>
-                <property name="can_focus">1</property>
                 <property name="draw_value">0</property>
                 <property name="restrict-to-fill-level">0</property>
                 <property name="hexpand">1</property>
diff --git a/gtk/ui/gtkpagesetupunixdialog.ui b/gtk/ui/gtkpagesetupunixdialog.ui
index 91c73639ae..1825498249 100644
--- a/gtk/ui/gtkpagesetupunixdialog.ui
+++ b/gtk/ui/gtkpagesetupunixdialog.ui
@@ -122,7 +122,6 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="portrait_radio">
-                <property name="can-focus">1</property>
                 <property name="hexpand">1</property>
                 <property name="active">1</property>
                 <child>
@@ -148,7 +147,6 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="reverse_portrait_radio">
-                <property name="can-focus">1</property>
                 <property name="hexpand">1</property>
                 <property name="active">1</property>
                 <property name="group">portrait_radio</property>
@@ -175,7 +173,6 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="landscape_radio">
-                <property name="can-focus">1</property>
                 <property name="hexpand">1</property>
                 <property name="active">1</property>
                 <property name="group">portrait_radio</property>
@@ -202,7 +199,6 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="reverse_landscape_radio">
-                <property name="can-focus">1</property>
                 <property name="hexpand">1</property>
                 <property name="group">portrait_radio</property>
                 <child>
diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui
index df4423cc5b..58c59e0c03 100644
--- a/gtk/ui/gtkplacesview.ui
+++ b/gtk/ui/gtkplacesview.ui
@@ -147,7 +147,6 @@
                 </child>
                 <child>
                   <object class="GtkScrolledWindow">
-                    <property name="can-focus">1</property>
                     <property name="vexpand">1</property>
                     <property name="shadow-type">in</property>
                     <property name="min-content-width">250</property>
@@ -157,7 +156,6 @@
                         <property name="shadow-type">none</property>
                         <child>
                           <object class="GtkListBox" id="recent_servers_listbox">
-                            <property name="can-focus">1</property>
                             <property name="selection-mode">none</property>
                             <signal name="row-activated" handler="on_recent_servers_listbox_row_activated" object="GtkPlacesView" swapped="yes"/>
                           </object>
@@ -194,7 +192,6 @@
                         <property name="shadow-type">none</property>
                         <child>
                           <object class="GtkListBox" id="listbox">
-                            <property name="can-focus">1</property>
                             <property name="selection-mode">none</property>
                             <signal name="row-activated" handler="on_listbox_row_activated" object="GtkPlacesView" swapped="yes"/>
                           </object>
@@ -272,7 +269,6 @@
           <object class="GtkButton" id="connect_button">
             <property name="label" translatable="yes">Con_nect</property>
             <property name="use-underline">1</property>
-            <property name="can-focus">1</property>
             <property name="sensitive">0</property>
             <property name="receives-default">1</property>
             <property name="valign">center</property>
@@ -284,7 +280,6 @@
             <property name="hexpand">1</property>
             <child>
               <object class="GtkEntry" id="address_entry">
-                <property name="can-focus">1</property>
                 <property name="hexpand">1</property>
                 <property name="width-chars">20</property>
                 <property name="placeholder-text" translatable="yes">Enter server address…</property>
@@ -297,7 +292,6 @@
             </child>
             <child>
               <object class="GtkMenuButton" id="server_list_button">
-                <property name="can-focus">1</property>
                 <property name="receives-default">1</property>
                 <property name="direction">up</property>
                 <property name="popover">recent_servers_popover</property>
diff --git a/gtk/ui/gtkplacesviewrow.ui b/gtk/ui/gtkplacesviewrow.ui
index 1177326b40..bd4ec79d89 100644
--- a/gtk/ui/gtkplacesviewrow.ui
+++ b/gtk/ui/gtkplacesviewrow.ui
@@ -3,7 +3,6 @@
   <requires lib="gtk+" version="3.16"/>
   <template class="GtkPlacesViewRow" parent="GtkListBoxRow">
     <property name="width-request">100</property>
-    <property name="can-focus">1</property>
     <child>
       <object class="GtkBox" id="box">
         <property name="margin-start">12</property>
diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui
index eccba317b2..0d17fe3a16 100644
--- a/gtk/ui/gtkprintunixdialog.ui
+++ b/gtk/ui/gtkprintunixdialog.ui
@@ -52,7 +52,6 @@
             <property name="vexpand">1</property>
             <child>
               <object class="GtkNotebook" id="notebook">
-                <property name="can-focus">1</property>
                 <property name="show-border">0</property>
                 <child>
                   <object class="GtkNotebookPage">
@@ -70,12 +69,10 @@
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkScrolledWindow" id="printer_swin">
-                                <property name="can-focus">1</property>
                                 <property name="shadow-type">in</property>
                                 <property name="vexpand">1</property>
                                 <child>
                                   <object class="GtkTreeView" id="printer_treeview">
-                                    <property name="can-focus">1</property>
                                     <property name="model">printer_list_filter</property>
                                     <signal name="row-activated" handler="emit_ok_response" swapped="no"/>
                                     <child internal-child="selection">
@@ -169,7 +166,6 @@
                                     <child>
                                       <object class="GtkRadioButton" id="all_pages_radio">
                                         <property name="label" translatable="yes">_All Pages</property>
-                                        <property name="can-focus">1</property>
                                         <property name="use-underline">1</property>
                                         <property name="active">1</property>
                                         <layout>
@@ -183,7 +179,6 @@
                                       <object class="GtkRadioButton" id="current_page_radio">
                                         <property name="label" translatable="yes">C_urrent Page</property>
                                         <property name="sensitive">0</property>
-                                        <property name="can-focus">1</property>
                                         <property name="use-underline">1</property>
                                         <property name="group">all_pages_radio</property>
                                         <layout>
@@ -197,7 +192,6 @@
                                       <object class="GtkRadioButton" id="selection_radio">
                                         <property name="label" translatable="yes">Se_lection</property>
                                         <property name="sensitive">0</property>
-                                        <property name="can-focus">1</property>
                                         <property name="use-underline">1</property>
                                         <property name="group">all_pages_radio</property>
                                         <layout>
@@ -210,7 +204,6 @@
                                     <child>
                                       <object class="GtkRadioButton" id="page_range_radio">
                                         <property name="label" translatable="yes">Pag_es:</property>
-                                        <property name="can-focus">1</property>
                                         <property name="tooltip-text" translatable="yes">Specify one or more page ranges,
  e.g. 1–3, 7, 11</property>
                                         <property name="use-underline">1</property>
@@ -224,7 +217,6 @@
                                     </child>
                                     <child>
                                       <object class="GtkEntry" id="page_range_entry">
-                                        <property name="can-focus">1</property>
                                         <property name="tooltip-text" translatable="yes">Specify one or more page ranges,
  e.g. 1–3, 7, 11</property>
                                         <property name="activates-default">1</property>
@@ -287,7 +279,6 @@
                                     </child>
                                     <child>
                                       <object class="GtkSpinButton" id="copies_spin">
-                                        <property name="can-focus">1</property>
                                         <property name="valign">baseline</property>
                                         <property name="adjustment">copies_spin_adjustment</property>
                                         <signal name="changed" handler="update_dialog_from_capabilities" object="GtkPrintUnixDialog" swapped="yes"/>
@@ -301,7 +292,6 @@
                                     <child>
                                       <object class="GtkCheckButton" id="collate_check">
                                         <property name="label" translatable="yes">C_ollate</property>
-                                        <property name="can-focus">1</property>
                                         <property name="use-underline">1</property>
                                         <signal name="toggled" handler="update_collate_icon" swapped="no"/>
                                         <layout>
@@ -313,7 +303,6 @@
                                     <child>
                                       <object class="GtkCheckButton" id="reverse_check">
                                         <property name="label" translatable="yes">_Reverse</property>
-                                        <property name="can-focus">1</property>
                                         <property name="use-underline">1</property>
                                         <signal name="toggled" handler="update_collate_icon" swapped="no"/>
                                         <layout>
@@ -506,7 +495,6 @@
                                         <child>
                                           <object class="GtkSpinButton" id="scale_spin">
                                             <property name="valign">baseline</property>
-                                            <property name="can-focus">1</property>
                                             <property name="adjustment">scale_spin_adjustment</property>
                                             <property name="digits">1</property>
                                           </object>
@@ -817,7 +805,6 @@
                                 <child>
                                   <object class="GtkRadioButton" id="print_now_radio">
                                     <property name="label" translatable="yes" comments="this is one of the choices for the print at option in the print dialog">_Now</property>
-                                    <property name="can-focus">1</property>
                                     <property name="use-underline">1</property>
                                     <property name="active">1</property>
                                     <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
@@ -832,7 +819,6 @@
                                   <object class="GtkRadioButton" id="print_at_radio">
                                     <property name="sensitive">0</property>
                                     <property name="label" translatable="yes" comments="this is one of the choices for the print at option in the print dialog. It also serves as the label for an entry that allows the user to enter a time.">A_t:</property>
-                                    <property name="can-focus">1</property>
                                     <property name="has-tooltip">1</property>
                                     <property name="tooltip-markup" translatable="yes">Specify the time of print,
  e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
@@ -851,7 +837,6 @@
                                 <child>
                                   <object class="GtkEntry" id="print_at_entry">
                                     <property name="sensitive">0</property>
-                                    <property name="can-focus">1</property>
                                     <property name="has-tooltip">1</property>
                                     <property name="tooltip-markup" translatable="yes">Specify the time of print,
  e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
@@ -875,7 +860,6 @@
                                   <object class="GtkRadioButton" id="print_hold_radio">
                                     <property name="sensitive">0</property>
                                     <property name="label" translatable="yes" comments="this is one of the choices for the print at option in the print dialog. It means that the print job will not be printed until it explicitly gets &apos;released&apos;.">On _hold</property>
-                                    <property name="can-focus">1</property>
                                     <property name="has-tooltip">1</property>
                                     <property name="tooltip-markup" translatable="yes">Hold the job until it is explicitly released</property>
                                     <property name="tooltip-text" translatable="yes">Hold the job until it is explicitly released</property>
@@ -989,7 +973,6 @@
                     <property name="position">3</property>
                     <property name="child">
                       <object class="GtkScrolledWindow" id="image_quality_page">
-                        <property name="can-focus">1</property>
                         <property name="hscrollbar-policy">never</property>
                         <property name="hexpand">1</property>
                         <child>
@@ -1021,7 +1004,6 @@
                     <property name="position">4</property>
                     <property name="child">
                       <object class="GtkScrolledWindow" id="color_page">
-                        <property name="can-focus">1</property>
                         <property name="hscrollbar-policy">never</property>
                         <child>
                           <object class="GtkViewport" id="viewport2">
@@ -1052,7 +1034,6 @@
                     <property name="position">5</property>
                     <property name="child">
                       <object class="GtkScrolledWindow" id="finishing_page">
-                        <property name="can-focus">1</property>
                         <property name="hscrollbar-policy">never</property>
                         <child>
                           <object class="GtkViewport" id="viewport3">
@@ -1083,7 +1064,6 @@
                     <property name="position">6</property>
                     <property name="child">
                       <object class="GtkScrolledWindow" id="advanced_page">
-                        <property name="can-focus">1</property>
                         <property name="hscrollbar-policy">never</property>
                         <child>
                           <object class="GtkViewport" id="viewport4">
diff --git a/gtk/ui/gtkscalebutton.ui b/gtk/ui/gtkscalebutton.ui
index 81320fdf5b..1714b8b126 100644
--- a/gtk/ui/gtkscalebutton.ui
+++ b/gtk/ui/gtkscalebutton.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkScaleButton" parent="GtkButton">
-    <property name="can-focus">1</property>
     <property name="receives-default">1</property>
     <property name="relief">none</property>
     <property name="focus-on-click">0</property>
@@ -27,7 +26,6 @@
         <property name="spacing">4</property>
         <child>
           <object class="GtkButton" id="plus_button">
-            <property name="can-focus">1</property>
             <property name="receives-default">1</property>
             <property name="relief">none</property>
             <property name="halign">center</property>
@@ -39,7 +37,6 @@
         <child>
           <object class="GtkScale" id="scale">
             <property name="height-request">100</property>
-            <property name="can-focus">1</property>
             <property name="orientation">vertical</property>
             <property name="inverted">1</property>
             <property name="round-digits">1</property>
@@ -49,7 +46,6 @@
         </child>
         <child>
           <object class="GtkButton" id="minus_button">
-            <property name="can-focus">1</property>
             <property name="receives-default">1</property>
             <property name="relief">none</property>
             <property name="halign">center</property>
diff --git a/gtk/ui/gtkvolumebutton.ui b/gtk/ui/gtkvolumebutton.ui
index 67e881f015..7859505c6c 100644
--- a/gtk/ui/gtkvolumebutton.ui
+++ b/gtk/ui/gtkvolumebutton.ui
@@ -6,7 +6,6 @@
     <property name="page-increment">0.2</property>
   </object>
   <template class="GtkVolumeButton" parent="GtkScaleButton">
-    <property name="can-focus">1</property>
     <property name="receives-default">1</property>
     <property name="has-tooltip">1</property>
     <property name="relief">none</property>
-- 
2.30.2